[libc++] Fix use of static in constexpr #160180
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`static` is not allowed inside constexpr functions in C++ versions below 23. This is causing a build error when compiled with GCC and warning when compiled with Clang. This patch fixes this.
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Prabhu Rajasekaran (Prabhuk) Changes
Full diff: https://github.com/llvm/llvm-project/pull/160180.diff 1 Files Affected:
diff --git a/libcxx/include/__algorithm/make_heap.h b/libcxx/include/__algorithm/make_heap.h
index 8cfeda2b59811..c592656374dac 100644
--- a/libcxx/include/__algorithm/make_heap.h
+++ b/libcxx/include/__algorithm/make_heap.h
@@ -36,7 +36,8 @@ __make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compar
using __diff_t = __iter_diff_t<_RandomAccessIterator>;
const __diff_t __n = __last - __first;
- static const bool __assume_both_children = is_arithmetic<__iter_value_type<_RandomAccessIterator> >::value;
+ _LIBCPP_CONSTEXPR_SINCE_CXX14 const bool __assume_both_children =
+ is_arithmetic<__iter_value_type<_RandomAccessIterator> >::value;
// While it would be correct to always assume we have both children, in practice we observed this to be a performance
// improvement only for arithmetic types.
|
Drop static and constexpr for __assume_both_children. Simply leave it to be plain `const`. Co-authored-by: A. Jiang <de34@live.cn>
|
@frederick-vs-ja Can you PTAL at the updated patch? This issue is breaking our downstream builders. Thank you. |
frederick-vs-ja
approved these changes
Sep 23, 2025
|
Thank you @frederick-vs-ja |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
staticis not allowed inside constexpr functions in C++ versions below23. This is causing a build error when compiled with GCC and warning
when compiled with Clang. This patch fixes this.